Don't add jasper to all_loaders if no libjasper.

2007-11-26  Tor Lillqvist  <tml@novell.com>

	* configure.in: Don't add jasper to all_loaders if no libjasper.

	* gdk-pixbuf/Makefile.am: Fix static build of the icns loader.

svn path=/trunk/; revision=19044

diff --git a/ChangeLog b/ChangeLog
index e933ff91bcc5a0c9f4aee594445975590045961c..0e5ab72cf723212524576cec426888574fbbacf3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-26  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in: Don't add jasper to all_loaders if no libjasper.
+
 2007-11-25  Bastien Nocera  <hadess@hadess.net>
 
        * configure.in: Add detection for libjasper, used by the

diff --git a/configure.in b/configure.in
index e17ba8478ec1e67fd23d7ff8862b3b67b1dc021c..023b32664e0599b1b1d2296d7784b370358c8d3c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -901,7 +901,10 @@ else
    fi
 fi
 
-all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,xbm,tga,pcx,icns,jasper"
+all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,xbm,tga,pcx,icns"
+if test x$with_libjasper != xno; then
+  all_loaders="$all_loaders,jasper"
+fi
 included_loaders=""
 # If no loaders specified, include all
 if test "x$with_included_loaders" = xyes ; then

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f3be42fb6cd58793e1aea2b954bb29eaae9a5853..593ff30c307dd57e6dcc980c2b76f9a92517aa1b 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-25  Tor Lillqvist  <tml@novell.com>
+
+       * Makefile.am: Fix static build of the icns loader.
+
 2007-11-25  Bastien Nocera  <hadess@hadess.net>
 
        * Makefile.am:

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 272cc31501cd5ec484048e34e2d93b66a1cb24bf..51904bf24ee9f9ea5cf43e041307654b7f3b7164 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -168,7 +168,7 @@ libpixbufloader_tga_la_LIBADD = $(module_libs)
 #
 # The .icns loader
 #
-libpixbufloader_static_icns_la_SOURCES = io-icns.c
+libstatic_pixbufloader_icns_la_SOURCES = io-icns.c
 libpixbufloader_icns_la_SOURCES = io-icns.c
 libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libpixbufloader_icns_la_LIBADD = $(module_libs)
@@ -280,7 +280,7 @@ PCX_LIB = libpixbufloader-pcx.la
 endif
 
 if INCLUDE_ICNS
-STATIC_ICNS_LIB = libpixbufloader-static-icns.la
+STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la
 else
 ICNS_LIB = libpixbufloader-icns.la
 endif